From: Julien Grall Date: Wed, 19 Mar 2014 15:43:38 +0000 (+0000) Subject: xen/arm: Use p2m_restore_state in construct_dom0 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5317 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=d6dd3a9ae7adead322e8ce96f83db96dce64c982;p=xen.git xen/arm: Use p2m_restore_state in construct_dom0 The address translation functions used while building dom0 rely on certain EL1 state being configured. In particular they are subject to the behaviour of SCTLR_EL1.M (stage 1 MMU enabled). The Xen (and Linux) boot protocol require that the kernel be entered with the MMU disabled but they don't say anything explicitly about exception levels other than the one which is active when entering the kernels. Arguably the protocol could be said to apply to all exception levels but in any case we should cope with this and setup the EL1 state as necessary. Fu Wei discovered this when booting Xen from grub.efi over UEFI, it's not clear whether grub or UEFI is responsible for leaving stage 1 MMU enabled. Use directly the newly created function p2m_restore_state to retrieve a correct EL1 state to translate an address. Signed-off-by: Julien Grall Reported-by: Fu Wei Acked-by: Tim Deegan Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c9dda0e7af..502db84690 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1021,14 +1021,7 @@ int construct_dom0(struct domain *d) return rc; /* The following loads use the domain's p2m */ - p2m_load_VTTBR(d); -#ifdef CONFIG_ARM_64 - d->arch.type = kinfo.type; - if ( is_32bit_domain(d) ) - WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~HCR_RW, HCR_EL2); - else - WRITE_SYSREG(READ_SYSREG(HCR_EL2) | HCR_RW, HCR_EL2); -#endif + p2m_restore_state(v); /* * kernel_load will determine the placement of the initrd & fdt in